DevOps Module 2: Version Control With GIT02 Collaborative Workflowsa. Merging and resolving conflictsMerging and resolving conflicts